From b08305d2d713bd16200bb010b0665d97533b740e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 11 Jun 2006 19:59:58 +0000 Subject: [PATCH] Fix MSVC build problem. (#339739, Kazuki Iwamoto) 2006-06-11 Tor Lillqvist * gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739, Kazuki Iwamoto) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkprintoperation-win32.c | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0534d02355..1d20a28e63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-11 Tor Lillqvist + * gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739, + Kazuki Iwamoto) + * gdk/win32/gdkproperty-win32.c (gdk_property_change): Convert \n to \r\n also when storing CF_UNICODETEXT (UTF-16) in the Clipboard. (#344496) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0534d02355..1d20a28e63 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-11 Tor Lillqvist + * gtk/gtkprintoperation-win32.c: Fix MSVC build problem. (#339739, + Kazuki Iwamoto) + * gdk/win32/gdkproperty-win32.c (gdk_property_change): Convert \n to \r\n also when storing CF_UNICODETEXT (UTF-16) in the Clipboard. (#344496) diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index dd37581de9..8184846604 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -29,6 +29,7 @@ #ifdef HAVE_UNISTD_H #include #endif +#include #include #include #include @@ -70,6 +71,7 @@ static void win32_poll_status (GtkPrintOperation *op); static const GUID myIID_IPrintDialogCallback = {0x5852a2c3,0x6530,0x11d1,{0xb6,0xa3,0x0,0x0,0xf8,0x75,0x7b,0xf9}}; +#ifndef _MSC_VER #undef INTERFACE #define INTERFACE IPrintDialogCallback DECLARE_INTERFACE_ (IPrintDialogCallback, IUnknown) @@ -81,6 +83,7 @@ DECLARE_INTERFACE_ (IPrintDialogCallback, IUnknown) STDMETHOD (SelectionChange)(THIS) PURE; STDMETHOD (HandleMessage)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*) PURE; }; +#endif static UINT got_gdk_events_message; @@ -536,8 +539,9 @@ win32_poll_status (GtkPrintOperation *op) status_str = NULL; if (ret) { + DWORD win32_status; job_info = (JOB_INFO_1W *)data; - DWORD win32_status = job_info->Status; + win32_status = job_info->Status; if (job_info->pStatus) status_str = g_utf16_to_utf8 (job_info->pStatus, -- 2.30.2